ad45549e2a886a13ca11b05187e0ed40481bc084,app/femr/ui/controllers/superuser/TripController.java,TripController,citiesPost,#,88
Before Change
StringUtils.isNotNullOrWhiteSpace(tripViewModelPost.getNewCityCountry())) {
ServiceResponse<CityItem> newCityServiceResponse = missionTripService.createNewCity(tripViewModelPost.getNewCity(), tripViewModelPost.getNewCityCountry());
if (newCityServiceResponse.hasErrors())
throw new RuntimeException();
}
TripViewModelGet tripViewModel = createViewModel();
After Change
CurrentUser currentUser = sessionService.retrieveCurrentUserSession();
TripViewModelPost tripViewModelPost = tripViewModelPostForm.bindFromRequest().get();
List<String> messages = new ArrayList<>();
//Create a new city if the user has entered the city and country
if (StringUtils.isNotNullOrWhiteSpace(tripViewModelPost.getNewCity()) &&
StringUtils.isNotNullOrWhiteSpace(tripViewModelPost.getNewCityCountry())) {
ServiceResponse<CityItem> newCityServiceResponse = missionTripService.createNewCity(tripViewModelPost.getNewCity(), tripViewModelPost.getNewCityCountry());
if (newCityServiceResponse.hasErrors()) {
messages.addAll(
newCityServiceResponse.getErrors()
.keySet()
.stream()
.map(key -> newCityServiceResponse.getErrors().get(key))
.collect(Collectors.toList()
)
);
}
}